[IA64] dma-mapping.h user our own swiotlb.h header

Signed-off-by: Takanori Kasai <kasai.takanori@jp.fujitsu.com>

diff --git a/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h b/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h
index fa4c2019cd92478f69c6c2a7dcf479196644945c..b58ed3a4736330f167357f38abca9399676734f1 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h
@@ -10,7 +10,7 @@
 /* Needed for arch/i386/kernel/swiotlb.c and arch/i386/kernel/pci-dma-xen.c */
 #include <asm/hypervisor.h>
 /* Needed for arch/i386/kernel/swiotlb.c */
-#include <asm-i386/mach-xen/asm/swiotlb.h>
+#include <asm/swiotlb.h>
 #endif
 
 #ifndef CONFIG_XEN

diff --git a/linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h b/linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h
index bb3d7d2416f8c58bb0ccbc97c479885d4c00bdb5..74a0c21bbecfe61793e0ffc7ec067239f5e97879 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h
@@ -34,8 +34,6 @@ extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dma_address,
 extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);
 extern void swiotlb_init(void);
 
-extern unsigned int dma_bits;
-
 #ifdef CONFIG_SWIOTLB
 extern int swiotlb;
 #else